From 2c1e567fcdd506e186749a555ade82caec38b857 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 28 Jul 2009 02:07:54 +0000 Subject: [PATCH] (font_parse_xlfd): Check DPI and AVGWIDTH properties more rigidly. --- src/font.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/font.c b/src/font.c index d2cd1febe93..cfc48523d12 100644 --- a/src/font.c +++ b/src/font.c @@ -1139,7 +1139,10 @@ font_parse_xlfd (name, font) } } - ASET (font, FONT_DPI_INDEX, INTERN_FIELD (XLFD_RESY_INDEX)); + val = INTERN_FIELD (XLFD_RESY_INDEX); + if (! NILP (val) && ! INTEGERP (val)) + return -1; + ASET (font, FONT_DPI_INDEX, val); val = INTERN_FIELD (XLFD_SPACING_INDEX); if (! NILP (val)) { @@ -1151,8 +1154,10 @@ font_parse_xlfd (name, font) p = f[XLFD_AVGWIDTH_INDEX]; if (*p == '~') p++; - ASET (font, FONT_AVGWIDTH_INDEX, - font_intern_prop (p, f[XLFD_REGISTRY_INDEX] - 1 - p, 0)); + val = font_intern_prop (p, f[XLFD_REGISTRY_INDEX] - 1 - p, 0); + if (! NILP (val) && ! INTEGERP (val)) + return -1; + ASET (font, FONT_AVGWIDTH_INDEX, val); } else { -- 2.30.2